From 918c6260b30fe6e5a40ab0ba7e277809d3dbc369 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Sun, 30 Apr 2006 09:50:49 +0100 Subject: [PATCH] Introduce XEN_IA64_DOM0_NON_VP to simplify some ifdefs from defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP) to defined(XEN_IA64_DOM0_NON_VP). Signed-off-by: Isaku Yamahata --- linux-2.6-xen-sparse/arch/ia64/Kconfig | 9 ++++++++- linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c | 4 ++-- linux-2.6-xen-sparse/drivers/xen/blkback/interface.c | 2 +- linux-2.6-xen-sparse/lib/Makefile | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/ia64/Kconfig b/linux-2.6-xen-sparse/arch/ia64/Kconfig index 13df89f457..9dfbec6db3 100644 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig @@ -90,12 +90,19 @@ config XEN_BLKDEV_BACKEND default y config XEN_IA64_DOM0_VP + bool "dom0 vp model" depends on XEN - bool default n help dom0 vp model +config XEN_IA64_DOM0_NON_VP + bool + depends on !(XEN && XEN_IA64_DOM0_VP) + default y + help + dom0 P=M model + config XEN_SYSFS bool "Export Xen attributes in sysfs" depends on XEN && SYSFS diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c index 8ed82df723..48be015532 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c @@ -410,7 +410,7 @@ static void dispatch_rw_block_io(blkif_t *blkif, } pending_handle(pending_req, i) = map[i].handle; -#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP) +#ifdef CONFIG_XEN_IA64_DOM0_NON_VP pending_vaddrs[vaddr_pagenr(pending_req, i)] = (unsigned long)gnttab_map_vaddr(map[i]); #else @@ -546,7 +546,7 @@ static int __init blkif_init(void) blkif_interface_init(); -#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP) +#ifdef CONFIG_XEN_IA64_DOM0_NON_VP extern unsigned long alloc_empty_foreign_map_page_range( unsigned long pages); mmap_vstart = (unsigned long) diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c index 15ff3d1b5a..cc5c6b5930 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c @@ -74,7 +74,7 @@ static int map_frontend_page(blkif_t *blkif, unsigned long shared_page) blkif->shmem_ref = shared_page; blkif->shmem_handle = op.handle; -#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP) +#ifdef CONFIG_XEN_IA64_DOM0_NON_VP /* on some arch's, map_grant_ref behaves like mmap, in that the * passed address is a hint and a different address may be returned */ blkif->blk_ring_area->addr = gnttab_map_vaddr(op); diff --git a/linux-2.6-xen-sparse/lib/Makefile b/linux-2.6-xen-sparse/lib/Makefile index 44c3323e11..2657bb5d10 100644 --- a/linux-2.6-xen-sparse/lib/Makefile +++ b/linux-2.6-xen-sparse/lib/Makefile @@ -45,7 +45,7 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o obj-$(CONFIG_SWIOTLB) += swiotlb.o -ifneq ($(CONFIG_IA64)$(CONFIG_XEN_IA64_DOM0_VP),yn) +ifneq ($(CONFIG_XEN_IA64_DOM0_NON_VP),y) swiotlb-$(CONFIG_XEN) := ../arch/i386/kernel/swiotlb.o endif -- 2.30.2